Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 06:46:13 +0000 (23:46 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 06:46:13 +0000 (23:46 -0700)

Trivial merge